UI Initial Update
Merge pull request #21 from rjraffa/UIinitialUpdate

UI Initial Update