Various page formatting clean ups