Refactor company form and display