new version with css fix