Get toolbar working

Latest changes