fixed ui + other changes