re-factored layout, simplified model/panel