More significant changes to ClientApp