Fixes for Page Structure