update to two, cleaning html + generalising css