Moved header into pages, tidied up demo a bit