Refactored with CSS-only layout