Removed sortable table fields
Added component class
Added component class
Lots of changes