More reorganizing, menu link added, minor text changes