added photo button, more cleanup

still crashing everywhere