Streamlining more UI changes and codebase