improved UI more