more cleaning up and new divs