Changed routes round
Added locations
Templates and style updates