layout trip cover photo and map
tinkering styles
remove notes
fix conflicts