got rid of some redundant properties and changed most of the tableviews to new style