Fix keyboard bug.
Add two more components