Change layout. Fix functionality.

fning
bjmcmorran