removed commented fields
Adjusted cell padding