Second draft of the article reader.
Refactoring
Bugfix
Fixes