cleanup commit 2 and trip day view partially done