Some changes, mostly styling