Started adding logic for toolbar