Experimenting with some UI changes and adding target unit selection