Added location UI and fixed merge conflicts and fixed exploded things