Fixed conflicting method names
Updated views with new code structure with same results as before, great refactoring