Fix Bug 983404: Matej copy tweaks. Used css as much as possible to avoid...

... additional string merge.