Fixed scenario planning and overview issues