Martin css fix v.2
merge