Add fotorama and refactoring