fixes stop buttons in overview
Merge remote-tracking branch 'origin/development' into development