layout changes, added some forms
merge conflicts