Simplify button markup/logic, re-introduce eq builder buttons
Rm extra linebreaks