Removing the UI model and consolidated into controller