Continue to delegate and pare down display code