UI and alignment fixes