Fix HAL-185
Fix HAL-186
Clean up web subsystem views