fix for issue #62 - now 'restarting' will not cause layout switch