rearrange form html
add form styling