Buttons refactored, #5
Merge after CSSLint changes