db
fixed conflicts
styling stuff
nav styled and buttons styled
nav styled and buttons styled