Moved secondary content out of primary content and added sub menu classes