Changed form to better display labels