Minor page and layout clean up