Fix #117

Fix CCS for #117
#166 also fixed edit user page