Navigation tab redesign
Refactoring