reworked page and display