fixed the javascript errors, buttons still not working
git pull and merge conflicts borked shit
more cleanup from borked merge
more cleanup from borked merge