Fixed the hidden button locations, and cleaned up the JS.