Improve customers form