moving stuff

just moving things around
added location + loading page

gotta change some stuff in the manifest to get it working I think??
sorry!!