improvements, remove locate control