Add kadira
Fix a bug
Restyle and refactor