Add back in ids and class to make js work

WARNING: This may break some styling I am building it back up today.
This decision was made to help backwards compatibility for js.