fixes menu, routing