added background and styling
fixed merge conflicts