Responsive form and small refactor