Delete elements + Design improvements