[UPDATE] UI Revamp