Changed Forms to match new layout, fixed error in share contracts

Changed Forms to match new layout, fixed error in share contracts