More UI and layout changes