Updated views, refactored.