Styling articles view
Styling articles view
Fixed merge conflicts