Feature/registration

changes on basic template