Fixed images, tightened up main window