#9 - Views, controller and model updated
#9 - Model, test and features updated