Includes fixes suggested by Aby
Merge pull request #8 from shobhitpuri/app-new-ui

Removed unused files and made few fixes