UI Improvements

Various UI Updates/Improvements