layout changes
change logic to or