UI Cleanup

Syncing up the features with the UI.  Just some small fixes.