Fixed another some issues in default jaw theme