Got one step ahead with resize of table, but for now it's a mess. 
As addition i did few minor changes in object construction.