CSS changes
fixed merge isues