some fix in views and controllers