got rid of horrible image that was messing everything up
fixed nav dropbar
fixed size of nav bar
worked on date view--did not fix
fixed merge conflicts