cleaned up package, need to test the photo view