Design 2 branch
2nd design style
Design 2 updated headers