:thumbsup: cleaning up navigation