big imporvement to design. Still needs more js.