Improve layout.
Add items removal.