Improve UI for empty states - Propless SDC