minor improvements, get rid of form tags