Minor form formatting updates