[BUG #8417] use more precise selectors to prevent problems with nested widgets
[BUG #8417] remove empty page container