Updated grid to handle buttons and forms
Merged