Clean up views
Add association specs