Fix problems found by lint
Some methods extraction related to page container event dispatching
More refactoring