fixed/updated some of the screen navigation