Some little touches in form for responsive
Resolve conflict