Moved data from all views to the controllers