some tweaks and fixes, ui tweaks