Merge pull request #9 from alexivanov84/branch#1

Branch#1
updated fields, grid buttons