Indentation
Font and position cleanup
Number box instrumentation, more or less