Lead modal forms to to one style

Change-Id: I47180236db75c3834410cc0186c3b4e65b619b48