Updating design.
More design updates