More modifications for mobile friendliness.