Done refactoring new and update views