Fix #117

Fix CCS for #117
#166 also fixed edit user page
Merge pull request #170 from madd15/develop

Fix #117