CS/Typo fixes
Fixed typo and display bugs
Merge branch 'develop' into user