Adding board pages and refactor