Small tweaks for better mobile optimzation