Menu little fixes