Crear/merge/cosmetics

This depends on #58 
Mostly look and feel, some rewording.
Also adds a delete button for each list element.

<!---
@huboard:{"order":20.0}
-->