Refactor elements for better architecture