Lots of refactoring and makign the listviews look better