view fixes + optimization