Merge some radial menu work from 2011 and 2012