More GPS related changes
Uniformised the indentation on partials
Now re-using more code. Controllers probably duplicate each other