fix some phone display issues

Closes #848 and closes #847 

![screen shot 2014-09-18 at 10 40 44 am](https://cloud.githubusercontent.com/assets/1656824/4324474/f5979ec2-3f5a-11e4-904a-c708000cd20d.png)