Partials refactoring and User model/migration changes