Better map type selection and new button.