Issue #267 completed. Issue #412 not finished(button code was commented)