Better support for page objects (cleanup and support for 'transition')