pulled public
changed article structure
changed article structure
fixed article view