moving elements around. Updated hooks