Final thumbnav fix