Added esc_attr where needed