Modified some views/controllers