Button signal for transition

Also improved views