Code cleanups.
Cleaned up UI.