Improve element template