All done except for putting together a menu of links for Administration and fixing the Management links.