Feature/camera gallery refactor

Clear now.