Big fix in default view.