Layout changes

Some name changes and updated images