Folder Organization and some more Styling