UI Fixes from Sanket