removed NOAA
added settings
reordered menu