Glade tutorial branch fixed

Replaces the borked PR #3088. This is not squashed as I did not want to remove @spiessbuerger 's authorship on this work.