Phil's markup changes for guillermo

Making forms nice.