Front end 70%
Merge pull request #2 from myadlan/master

Front end 70%