layout changed to match my prefs