URI fixes for all pages