fixed ui and improved performance