Updating to the latest version

Trying to not break the layouts as far as changes go.