fixed menu, still not solved completely