Rearranging layout. Adding references.