styling;
arrange buttons;
cleanup
merge ethans changes in
date picker updates and trip count div;
resolve merge conflict;