iPhone Fixes
Merge branch 'css-updates'

Conflicts:
	css/main.css