prepare for merge
Merge branch 'master' of https://github.com/muksit/projects
cosmetic changes to UI