*some view improvement