Changing up some things and active button bar disclaimer