Add visibility flag shell surface

This fixes #554 
Fit the above two lines into one line?