New Toolbar and change some positions
"merge..."
§Merge branch 'Ingelhag' of https://github.com/EmmaEdv/funkypogys into Emma
minor changes :)