added info and home icons to header, added info page.
styling buttons for bus-map
Conflict resolution