updated ui & structure
Merge pull request #1 from fouad/master

updated ui & structure