BIG UPDATE, ALL PAGES DONE (except dashboard pages)