Modified code and added article view