fixed css type-o
merged with master, fixed conflicts