Refactored ClientApp.