Some more changes to take closer to final design