updated and fixed ui & dropdown