Fix layout and add deletion functionality for entries.