More css daisycutting and a new take to fix #17