Mar code cleanup and some nav adjustments.