Photo button and minor fixes