Css stuff update
merge fix