Added buttons. Gave up on the mixin for the time being.