More draw screen functionality and attempted to format the comma in thousand seapartor