HTML&CSS now reflect mock-up architecture