Screen navigation bug fixes