Updated html and controllers