fixed ui issues