update code from base pages, remove history logic for safari