Feature/camera gallery refactor

Cleaner, simpler... love it!