Working on dynamic toolbar

Getting ready to update demo