Moved image generator to its own module + visual changes