His career postwar included both aviation and general service appointments , the latter including command of the frigate Bigbury Bay , 1951-53 , the former as chief staff officer of the aircraft carrier squadron , 1956-58 .