dan-giddins

I've created a version of my PR (#854) with only the required changes, as I noticed someone else had the this issue (#938)

A fix to #266 Functionally it works including shortcut keys! Visually it looks like this  I spent quite a bit of time trying to get it to look right...