Updated location icons, moved location.js, sort protocols