Fixing JS

Tested it this time, had the IDs wrong last time. Cleaned up the IDs in the page to be a bit clearer.