some fixes
Added correct view