Move elements to helpers
Move elements to helpers