Redid join table, fixed some things
fixed issues in views