fixed ui and merged