Committing some more UI Fixes