ENH: general UI Enhancement