remove old layout. change order of navigation items.