Layout fixes

Fixed the layout with the new wrapper on each page