fixed display issues and like increments for photos
tried to merge with Sri
 changed things to match Sris controller version
Merge branch 'dev' into display
final version so far