Update to element so that controllers will implement smoothly

Updating Elements to work well.