Changed more things that were wrong with the mvc