Fixed input issues with CurrentUsage screen