layout updates, and added form section