one bug was fixed and style fixed

Bug with ColoumnSpan and RowSpan was fixed and Style for SurfaceButtons
is now independant from Styling of the Keys