More mobile-style fixes