Fix/element position

This PR is adding: