further UI & BL improvements