More UI tweaks and fixed.