Adjusted layouts and added trip buttons.