Bug fix

Fixes link to .js files
Almost final commit

Problems with buttons not disabling