Added some fixes to views. More one to many integration