Fixed compile issues in design.tex.
Merged design.tex, fixed compile errors.