Fixed UI layout issue