Cleaned up numbers on interface
Merge remote-tracking branch 'origin/master' into rendering