Rewrite client-side situation computation and fix views