mainly refactoring

[MW,PS] Connected Image (Red/Green Dot), deleted nothing selected for
dropdown menu, refactoring