Various UI Fixes

Various UI Fixes