Working on the UI and the model/controller