greate refactoring, add nav tabs