Layout changes mostly complete - created folder-selector table