Some slight adjustments to improve page performance