Better handling of displayed elements