Merge pull request #60 from MessiJS/prepare-for-2oh-final

Fix #54, the button spacing issue.