Changed Location panel organization and fixed links

Fixes #120 
This should be in the body of the panel