fixed ui and core bugs