Add footer and focus properly on modal form