Made fixes for certain functionality bc of individual pages.