improved css- and js-handling