Fixed toggle in AOI bbar and general clean up