UI Improvements

UI Improvements