Improve graphics of abilities and tokens
Add TODOs