Cleaned up some cosmetic things with the UI.