ui revamp part 1