Misc changes on user form