Fixed broken views