Added login/registration elements
Resolved merge conflicts