Some style changes
Merge branch 'master2__create_shortcuts' into master2