Minor refactoring + CameraGridViewAdapter