Reorder main nav and updated to current version 1.5