UI
Merge branch 'master' of https://github.com/arvind0937/prog-app-amp
routes conflict fix