Wrap elements in useful divs for styling

This allows us to control the borders around the button elments better