added custom css
fixed merge conflicts
fixed