Upgrade to latest CI packages
Slight tweaks to simplify loading of page