Improved change location in menu