numpad working and layout also