UI and layout fixes