Minor Improvements in UI