Fixed editing, saving and deleteing location. Code cleanup! ^_^