Switch to completely CSS-based solution