Fix window width bug
Add individual selection in optimisation tab