Merged in the changes to the character view layout from master