Reference views refactoring, Users layout bug fix