Migrate more layout to use established styles.  Move wind data to one line.  Remove dummy data in layouts