Improved model associations, view and controller
View improved