Fix comment count
Form design cleanup