added layout for registration form
fixed merge conflict