mergegui surface/bed toggling

mergegui - mostly surface/bed toggling, but also improvements to how
surface/bed are generated