Page fixes (renewed PR #1)