Beta2: match all CSS to design