Fix header
Merge branch 'finish_header' into new_design_preparation
almost worked forms