Menu and fixes