Fixes #36

Also fixes button sizing issue noted by kcollao.