Add quick access toolbar and flag follow up