Add rest of the keys (needs serious design job)