fixed UI
Improvements