Modified layout to make it easier to read.
UI Cleanup.