Added bug fixes matching Chaos' pull request comments
Refactored to satisfy PMD
Merge remote-tracking branch 'blackshadowshade/1157_random_button' into 186_random_button_ui
Passed $forceImplemented when picking random button