Cleaned up more code, removed magic numbers in views.
Merge remote-tracking branch 'origin/moneyPreDay1' into moneyPreDay1