More tweaks for UI