Refactored A LOT and include pages container