Layout Update incorporating previous layout design from playground repo