Folder restructuring
More display improvements