Tidy up HTML content and links, add demo5 page