Improved article#index view and simplified if conditions