First draft on #680, remove expander and use a floating panel thingie, need to add OSGi fields still