UI improvement: fixes