More component/dom and component/menu related fixes