Idea for the buttons.
Merge remote-tracking branch 'ospalh/master' into ospalh-special