Updated format of the type and
layout globally.
Updated to fix merge conflicts.