layout and statistics views are refactored