Some UI Fixes. No functionality added.