Refactored some of the views