Remove form labels, other tiny changes