User's views refactor