Added layout saving to shell