Added commening in View + small fixes