Refactoring
Finish default keyboard