Adding Divs

Added Divs and several small changes