Refactoring: index page + layout