Fixed null to "0" to only apply to grades. Added arrow key support