Controller, some changes in html