UI layout improvements