Changed General Info Structure

Changed the General Info section to the new structure, still need to add
the Edit and Add options for each.