Cleanup / improve profiles and folderview declaration