CSS  and JS Update

See previous pull request for CSS comments.

This update fixes 2 CSS bugs I had not caught before. Additionally it consolidates all the JS into a single file.