Better menu (but still buggy)