Rearrange the UI to be closer to final