added numerical keyboard and some tweaks