Synced + small bug fix
 Many changes to templates, to improve UI
UI changes complete
Merging Complete
Merge pull request #7 from digvijay91/UI

UI
Changes in UI