Minor design update, correction of headers