Make legend part of the content
Improve contrast of the buttons