fixed ui problems