Refactored the image window so that there's a seperate panel