fix user friendly id and ui revamp