Minor refactoring, ensure ordering after textview is drawn.