Toggle buttons. Issue #14
Bug fix