Fixed General UI

Input boxes and buttons have been rearranged, some of the text display
has been fixed to help the UX