simplified model and controller, updated css