updated views and some controller actions