improve and update views