Changed looks and feel slightly