Layout improvements and save to disk option
Folder restructuring