Updated dashboard

Updated styles for dashboard
Merged conflicts in last commit
Added database scripts