Refactor: Fixed more magic numbers; also fixed display

Pair programmed this