Minor UI Fixes.

Minor UI Fixes.