refactored ui elementes