Mild main view fixes