Clean up, reuse defines, change nav order