Some minor ui tweaks and a bug fix.