Improvements to layout. Release version 1.8.1