Improve buttons
Moved row containers into the layout file