V4.0

Hopefully able to merge updates to layout changes from v3.1 to v4.0