Tested new layout. Rolled back