Registration form and other changes