Refactoring views and few features for User model