Add rows and columns
Style updates including fixed footer
Fix merge conflicts