Condense JS to one file
Adding some more look/feel/functionality