Fix layout issues

see #189