some extra pages and controllers
merge