Update header - few design fixes