added shortMenuController and LocationService