Added improvements to PhotoActivity. Fixes #21