more minor changes for mobile optimization