UI revamp and polishing