Merge z workcopy

Maly update - patch do CSS i skryptu.