User UI changes
Merge branch 'production' of https://github.com/StrataLabs/service_desk into production