minor improvements
Added layout options