Minor fixes and UI Improvements