cleaned up ImagePanel, fixed a bug there, renamed a lot of things