Modified screen navigation and added light screen