redoing the nesting and margins of the entire CSS