UIElements_DONEDONE_Did some code arranging.