ui tweaks
fixing merge