Big images issue + refactor