many styling updates, about halfway there