Rename melon
Simplify drawing of box
Simplifications