Update bunch of pages and fix the layout around