fixed layout issues; Issue #1