bunch of changes

need to change color
navbar