refactor top draw