[YMP] More UI work