Refactor draft view display logic