Remove icons from demo (remove dependencies)
Some improvements to adding/focus