Move navtab hadling into handler