Add layout with icon and text
UI tweaks