Updated buttons
Updated grid
merge hell