Aleksxor/navigation view refactor