UI Improvements
Merge branch 'feature/UIImprovements' into develop

* feature/UIImprovements:
  UI Improvements