Added UI Fixes