Clean up our HTML a bit, removing the wrapper div and adding a main element