Added Cleaned up Makefile; moved javascript out of html template.