Fixed join table
Updated show views