Refactoring
Can remove uploaded photo [not worked yet]
Merge remote-tracking branch 'origin/Development' into maaak