Fixes to pages