Update with better nonfunctional layout
8 files changed