UI Improvements
Removed AngularJS