Revamp of UI