Make user data editable and add few tweaks