Fixed issues in tabs menu section