Further improved existing UI