Modifications to UI Layout.
Closes #7