Design update and minor content changes