Fix cell layout

715806f7 introduced layout changes and issues that needs to be fixed.

From what I've seen for know:

• Deletion button sizing
• Vertical spacing of items
• Horizontal spacing of cells

Current master:

Before: