views fix
few improvements