refactored all views+models+collections