db setup roles only
Updated some css
Conflicts resolved, day 3