Part of !131
I also added an additional commit which move win.go-previous and win.go-next into the ui file.
win.go-previous
win.go-next
Thanks