added menu, about to try to move location part to the service