Start of major refactoring of Reader's detail view