#162 Disable unit select visually
#162 Adjusted spacing
#420. Backmerge with master.