More UI refactoring, also reverted to v2.1 OWIN components.