Fixes for all pages