Started to refactor the layout after the WP code refactoring