fix id section names
converted into less nesting
minor arrangement of elements
start work on less nesting