Added remove functionality and some view/edit trip functionality, plus misc changes