Improved appearance of GUIs

Rearranged fields to make them more intuitively placed.