adapted ui
new version