Component 2 Final layouts

Ideas collected by Lewis Moore