Adding buttons and grid