Updated views and methods so numbers are correct