Crop and photo bugfixes

Fixes two small layout bugs (both probably caused by the b3 upgrade, in some way or other):

https://www.pivotaltracker.com/story/show/78175444
https://www.pivotaltracker.com/story/show/78175754