UI and Text changes
Merge branch 'master' of github.com:kalpesh-webonise/pix_app