fixed bug with changing screens