Fixed UI layout issues