css changes
final CSS changes
fixed merge error
changes