Fixed user modification and logout
Fixed small details
Merged contents