Merge new features, cleanup
Fix icons
Collection editing
Inplace editing
Move profiles to collections
Inplace editing, collections