Added @content
Added optional display property