#3437 More article re-factoring and sass cleanup