Improved Panel a bit