removed name and adapted views and controllers