remove trailing space
add button swap AB
refactor gap class names