Cleaned up and added a bit more consistency to the UI