css styling
fixed merge conflicts