Spans changed to make menu items fit in one line