ui and core fix