First part of major navigation changes, code styling fixes