Changed devise forms, added account settings