Fix references and update styles