Redoing PR#3271: Moving the readmore button to layouts