Fixed DB photo's. Started cleaning up code