fixing UI
Merge branch 'soulmatt'
Merge branch 'master' of https://github.com/this88mild7/bsg_pcms