Merge pull request #10 from digvijay91/admin

Admin
Development
Major UI changes + minor changes to internal code
Minor UI changes