UI Optimization Part-1

3 layouts almost done
Merge pull request #28 from zahid--ali/master

UI Optimization Part-1