Add new page controller, fix mapping and indentions