Continued work on internal pages