Variable win row size

Temporarily lost highlighting of win. Also needs a lot of cleaning up.