Improve and fix tabs navigation