UI Fixes
issue