Bug-fixes in view