updating basepage to be cleaner