Cleaning up markup

There's no need for all those divs!