improved UI
refs:
fixes: