Added content buttons

And renamed some classes