start to the refactor the view and #5