layout changes, added some forms