Merged leon's commits, changed display
- little bubbles inside to indicate energy
- slightly nicer coloring