RM

new changes to the form to comply with the style