Rearranging GUI a bit.