fixing some nav issues in main theme