Added Basic Trip View, and fixed a few layout issues