Few more minor ui tweaks