Fixed the issue with images not repainting, improved the gridbaglayout slightly