UI fixes
UI updates
Front End work started
Merged pull request