Added cancel button and add fixed method that compares current loc and pin loc