Ui

Improvements to UI components