More trips controller and views adjustments