Small enhancements

Several small enhancements.
Layout
Retrieve only the visible features