Revert "Revert "Fixed buttons and added comments.""

This reverts commit 88932e8b3c263a59a24b1b571bae00849a91351f.