move all html into layout
editing of fields