mostly styling and js fixes
Merge pull request #46 from Hikariii/Feature/BugfixesAndStyling

mostly styling and js fixes