ui tweaks by J-P & Timo