Fixed some UI behavior and ordering.