fix small bug
merge css changes