split the forms and tables more and simplified the markup