Devise forms modifications
Updated devise forms. Resolved merge conflict