refactor and slightly tweak css
bump versions