Feature/camera gallery refactor

Actually, I don't know what I did here. WTF!!!