Tweaks in model and css.