Condensed the change name/delete itinerary buttons, some other style fixings
fix merge conflicts. also got rid of some bugs
Merge pull request #60 from kaitlinhuben/eh-timeline

Bug/Timeline fixes