cleaning up
resolves conflicts
tweak to button text in photo.js