Improved user interface. Added verification for full row.