Added kay mapping
Merge branch 'dev/local' into develop
Updated styles