Moved ImagePanel to own class