Cleaning up the UI just a bit.