Fix whitespaces + delete button