demo pages reworked