Issue 67: Revised page design