Some changes to styles/structure