cert path and form margin fix