refactored the views from server