Take out links on the citycard
Added a margin bottom to the call to service page
Fixed merge conflicts