rearrange UI elements - hopefully cleaner