Feature/better registration form