UI Alignment Fix