full remake image collection screen (should be done) + some refactor work