Add commute page + Use component for list views