merging ui updates
Merge pull request #11 from Sammykhaleel/ui

merging ui updates