Mostly done refactoring Photo controller