correctly handles entry on article page
better structure