Refactored fields.php to include content