Lots of changes, next I will try to change to devise for user management.