Fixed things to work better on phones