Initial fixes - nav, same as ship checkbox, notes