Some styling fixes
Refactor photo methods