Merge pull request #12 from kmekler/kirby

Kirby - edit and new styling
Merge pull request #13 from kmekler/master

Merge pull request #12 from kmekler/kirby