add simpleform and little changes to layout