Changed order of user form