Fixing more views