Update layout to use SUSY 2