Cleanup + fix a table view (which is even UGLIER with iOS 7!!!)