Solving some UI issues
Merge pull request #4 from ehsania/master

Solving UI issues