re #138 - refactoring css and js