Reworking of UI into a single entity