General UI Fixes

General UI Fixes