Further mobile-friendly changes