Revamp ui