refoactry
add layout
form action button and so on