Mid-way refactoring, more ui streamlining