Data photo takes up entire screen now
Merge remote-tracking branch 'origin'