Working improving navitation (screen navigation)