Added login and registration forms
Fixed conflicts