fixed ui logic