Added trip/purpose, some more note view stuff