UI Alignment fixes