Pull From Master

display locations options also added to menu