enhanced ui
