Changed layout to use YAML