Fixed a few layout issues on phones