refactored all views