issue #30 layout changes fixed