added layout, tweaks still needed