Added dispose to help clear things up
Added serialization to the layouts