UI update
Merge pull request #67 from AmirolAhmad/master

UI update