UI updates
Merge pull request #3 from SEDAWGS/Hichams-Branch

UI updates