Fixing bug in user update method
Fixing layout bug