Fixing some issues with the new theme.