Wiki page refactor